(server-switch-buffer): Don't select a minibuffer.

diff --git a/lisp/server.el b/lisp/server.el
index 57b47c196ecdce9f2f273adb1f1b2e1c9aa186b5..7565509354259f6f8efe8d90fec1a32aa1ff7ffa 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -326,6 +326,8 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
         (select-window server-window))
        ((framep server-window)
         (select-window (frame-selected-window server-window))))
+  (if (window-minibuffer-p (selected-window))
+      (select-window (next-window nil 'nomini t)))
   (if next-buffer
       (if (and (bufferp next-buffer)
               (buffer-name next-buffer))